Merge "Move libandroid_runtime headers into frameworks/base/core/jni"
am: 541845908c

Change-Id: Ia15d168a42bd0290e7cdeb7d19c98210890ed095