Merge commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf' * commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf': API XML changes to accompany dalvik.system deprecation.
Merge commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf' * commit 'b9b6b17d73590e07d9fcfa50671bbd6df0f150cf': API XML changes to accompany dalvik.system deprecation.