They are no longer needed.
Bug: 31602715
Test: make checkbuild
Change-Id: I9a670568472d1c1809972f126e43a0bddd052aac
Reviewed-on: https://googleplex-android-review.git.corp.google.com/1478002
PDK-Review: Stephen Li <stephenli@google.com>
Tested-by: Sen Jiang <senj@google.com>
Reviewed-by: Alex Deymo <deymo@google.com>
Reviewed-by: Bill Yi <byi@google.com>
Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com>
(cherry picked from commit ee2b454f04)