Merge branch 'pie-gsi' of https://android.googlesource.com/platform//dalvik into HEAD

Change-Id: Ibc8960db48ac1425cd9601f205e241a97ca2ea27