Merge "Stop including libcore/include/ in frameworks/opt."
tree: 89a4d5ef58798c2c5efb0a83c9f2f32f2ba6c9a1
  1. service/
  2. PREUPLOAD.cfg