Merge "Replace deprecated serial buffer flush function" am: 3d1fc000a9
am: 6cc758e7a1

Change-Id: Iae06739942cd116e06fd91a1ef113267aad6c9f2
tree: b798cdffb073558a5854864aad65c6c5017341a0
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg