am 1bc20700: Merge "[FileEncap4] Simplify logic"

* commit '1bc20700d594af28bb87575df4279b0bed624c52':
  [FileEncap4] Simplify logic
tree: 2e85255e6eb36504f3d9f2b755646250bf79973f
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk