Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev
am: 2cef335b5b

Change-Id: Ife25840cfbfae896e00bb387915cf3a327da1185