Merge "Remove dependency on libnativehelper/JniConstants.h"
am: 7fbba6bbbc

Change-Id: I0f9375b245965ba445edecfa8a42e2cf123eba7c
tree: 5669be17c54d45fb368d31b4f6e58b0a78762202
  1. service/
  2. PREUPLOAD.cfg