Merge changes I152eb090,Ic40360bf

* changes:
  arm64: Fix the sdk_arm64 build products
  arm64: Fix aosp_arm64 system image.