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

Change-Id: Iedd8583e553fa5046a5434a56c0cf1e2a81851a7