Merge "Move attribute resolution from core/jni to libandroidfw"