Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"