tree 068ecfd0d96bd0f2f27a64f0b122038fd6ad8557
parent a902b38f88c8a23adb4f6a70f16caf7f1a0acac8
parent a61f81778e1577feec5be73972ab51c804f4f74d
author Yiwei Zhang <zzyiwei@google.com> 1523043013 -0700
committer android-build-merger <android-build-merger@google.com> 1523043013 -0700

Merge changes from topic "vkjson-relocation" into pi-dev am: 1163c37270
am: a61f81778e

Change-Id: Ia25ac3f5e46fb11f79266eae6fca03f476ef3d04