Merge "Move bionic ("runtime") apex definition into bionic/." am: 2244f40e51
am: 58bdddfa61

Change-Id: Ifd92530de4fe14e90c94202b42805b432abf3711