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

Change-Id: I333ebefc01b52bf2121617281a6fb114c1533570