Adding support for bionic

Change-Id: Ie113ddc14fad15d7e9e1de82f99b324ce53bae35
5 files changed