Add missing include

Change-Id: I9fc3ebf60b98760611ac2071c7c519a0f8326341
Fix format warnings

Change-Id: Id7aded4287cc8d5387a20389d3ef6220d67d1d88
Merge "Fix format warnings"
Do not force all command-line apps to be 32-bit only

This is a partial revert of
>Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3

Change-Id: I214e1bd117dd40150ac5f7447f12c72c61f09a2f
ACodec: add frame render/drop systrace

Change-Id: I7a33d4a937d039fd454b889ddb12b7ca1c0ff3c2
Merge "Do not force all command-line apps to be 32-bit only"
Temporary workaround for log spam

Bug: 13790505
Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02
Merge "Temporary workaround for log spam"
Merge "ACodec: add frame render/drop systrace"
Merge "Add missing include"
Merge remote-tracking branch 'aosp/master' into fml-master